Auto merge of #3064 - dtolnay:rustc-macro, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 6 Sep 2016 17:46:41 +0000 (10:46 -0700)
committerGitHub <noreply@github.com>
Tue, 6 Sep 2016 17:46:41 +0000 (10:46 -0700)
Macros 1.1

Tested with https://github.com/serde-rs/serde/pull/530. This should be able to merge independently of https://github.com/rust-lang/rust/pull/35957.

r? @alexcrichton

1  2 
src/doc/manifest.md

Simple merge